Revert f67254a..1106869

This rolls back to commit f67254a2690cd9f0e7e8fff3d3d0db6641b0d67e.