Revert 21a6a2e..48ac331

This rolls back to commit 21a6a2edda27a26a9cba83e9b295d6367cc2b8e0.