Revert b39c433..62a4abe

This rolls back to commit b39c433d89e12e473c754f0e2aa80de5004149f8.