Revert 6cfcdfd..5c9fbff

This rolls back to commit 6cfcdfd0ff7b561fa82d4449e72f405a9b856492.