Revert 5c85631..2adea02

This rolls back to commit 5c85631fbfe845e8d07b65f85a6904a44773cd3e.