Revert feb8f3a..357e865

This rolls back to commit feb8f3a3051d5a5b8058ad9f50e1a2ac81ecc221.