Reverting previous patch. Ok, let's take this from 1.2 instead... :-)