Revert 7647249..1b2c68d

This rolls back to commit 764724932cb7c1acf89af9925d2a00f77b2191c2.