Revert 9dd8f28..974f3be

This rolls back to commit 9dd8f28479642e30877e7b0b8c93c6193a969997.