Revert 1a95bc2..ac452c8

This rolls back to commit 1a95bc2b6775114c3725453df14dc62448a1f09b.