Revert f535fd5..e178d95

This rolls back to commit f535fd5e0859f6d2cd44f23962641733f544a03b.