Revert 1eee414..725fd54

This rolls back to commit 1eee414670b444118fd35e54b19d95059e2b0b62.