Revert eb7a8e1..dacabb0

This rolls back to commit eb7a8e126fa23af4bbdad1464305257034fa48ea.