Revert 9daa7f9..3e37fbe

This rolls back to commit 9daa7f90eb3b961549ce244f0f35080d4d531eae.