Revert 6a4f25b..6f11e87

This rolls back to commit 6a4f25be0c69b5c9ab084062e5a9fe62de00976f.