Revert 1b39a43..e2e6ecf

This rolls back to commit 1b39a432ca4c727ab4acbde8fb5b79bd4b5a0ac9.