Revert 783877a..fea7dce

This rolls back to commit 783877aead5bb28b7a9a7df8a27d05a568353966.