Revert 8c40523..ee1120f

This rolls back to commit 8c40523aea85b0313d3472deb93da3cc053f464c.