Revert e68a703..cd0aa78

This rolls back to commit e68a703672019c8a7f1163c703707315e32f497e.