Revert 4eaccee..cb25e53

This rolls back to commit 4eacceeca8884a0c7f9e819db1270de10dd17cf1.