Revert d3db1c6..e77dcc1

This rolls back to commit d3db1c66ba33d64c41e8a09577ff9fd6f5a56f94.