Revert 595291e..a1ac49a

This rolls back to commit 595291e7ee2ba5b43e4955454b3d2b807b922b6f.