Revert 2c254ea..564f97b

This rolls back to commit 2c254ea5c6bd21823b55f3b366969e00de67311c.
Resolve conflicts in local master