b4dc0d3r - 2011-09-03

Reverse patch, synced to trunk