Revert fed352d..10cf014

This rolls back to commit fed352d5e10c5a9084187d3381db19c62cb8d71f.