Revert 115eac4..b22a40f

This rolls back to commit 115eac456ee131a3c158e2063723117163442e25.