Revert 4c2ef5f..3dc56d4

This rolls back to commit 4c2ef5f951363a25ace3e69f69b4c24dc7f30dea.