Revert 25203fe..dca1086

This rolls back to commit 25203fe6dbb33beab5de7a7e4a1cffd94ae3b1a1.