Revert c71c8c3..6fe7147

This rolls back to commit c71c8c3339e16c432b7016cd59a0cd42d0fef891.