Revert 9f55500..576682a

This rolls back to commit 9f5550056b15fcdfe12d01adb6f925f880e0c9f5.