Revert 91f596f..9eb8b9e

This rolls back to commit 91f596f0ade4c1494454fc5046b3d06a22f21165.