Revert 41637ab..b4467f5

This rolls back to commit 41637ab04a93bac695536513f20f9e06be71c3b4.