Revert 2f70ecd..52dbf54

This rolls back to commit 2f70ecdc5cf13cde0c5138b3bf8a37b1d10331dc.
Reverted to working commit