Revert 4d37635..eacd947

This rolls back to commit 4d37635496472f3858978487c6896e7438bb3c44.