Revert 5598fea..2d0774c

This rolls back to commit 5598fea46ba175c23cd7ff40c8d7e918eddb5e2f.