Revert f5078ad..7e1634f

This rolls back to commit f5078ad00ff92d4c447f60dec75a87cd7f89a7ef.