Revert d3449bf..3ae9b7d

This rolls back to commit d3449bf57385b8ff8afadb3501a63ebd50443708.