Revert 335db46..870c86f

This rolls back to commit 335db461dd8780e3b3fdf979f9dc12cb9afba928.