Revert 7f99530..8083f0f

This rolls back to commit 7f99530a6259237b575dda497d275ec5228a948d.
201309231055