Revert 2275450..f226ab2

This rolls back to commit 2275450d219655cce334ad3aaba4d8785d247355.