Revert f773965..4abe685

This rolls back to commit f773965d240c06771c8e9202d5d4505a42513f2a.