Revert c84e11d..5dac4f1

This rolls back to commit c84e11d022f481549cc07e09607cf7bfb39252e6.