Revert c6914a0..a6c73ad

This rolls back to commit c6914a0676be4bdd6174f6aaceaa9354e354865f.