Revert be83ce8..e48447c

This rolls back to commit be83ce8095a66e5d3dfd88860b4b443e94619192.