Revert d589063..f36fb23

This rolls back to commit d5890631bdfaa53b004e1d1db2db3f6ffb26f299.