Revert 8d15d3e..ce245bb

This rolls back to commit 8d15d3e2f5ec6985d7390847522926167c4412b1.