Revert d184656..9c701ae

This rolls back to commit d184656568d15bacfc82bdb98cd00e6301594151.