Revert 34d36fe..1bcb4be

This rolls back to commit 34d36fe67203c3976217801f11d3c82c5cf46a59.