Revert bde2f74..d1ec52e

This rolls back to commit bde2f745400c2fec5c4e2a8f47fcdb32bce41601.