Revert 7e1bbd8..52085d6

This rolls back to commit 7e1bbd873c382bfd225342fabf5158cdb585556c.