Revert a30c19e..d0dd1f6

This rolls back to commit a30c19e3f13765a3b48829788bc1cb8b4e95cee4.