Revert 1cabd33..d5995bd

This rolls back to commit 1cabd3381c433c82dc9ef14c63e084c7e052967f.
201309241233