Revert 6b653ef..7d3a1ff

This rolls back to commit 6b653ef3b8e66da8cab0f42a13b9e34df5bd9745.