Revert 1d28908..158406b

This rolls back to commit 1d28908bdeafdc944f09c474d305a2d331ecea9e.