Revert 4d48e7b..a45e977

This rolls back to commit 4d48e7bfed92214fd07cca6891d1b00413e4b52e.