Revert d5c2cba..5dc025b

This rolls back to commit d5c2cba6d3dd63a4da47704c2ac8914a03250fda.