Reverted #540

Nuff said. Let's do this before #730 so people can work with it.