Revert 8be4bc5..3291349

This rolls back to commit 8be4bc5b5ae637c5839cd1f51b07e8d80db6c944.