Revert 2d8e12a..64c6dec

This rolls back to commit 2d8e12a8c62f2ce23dde30577f7f8095940ff0ed.