Revert d090707..509fc9a

This rolls back to commit d090707abbc35967b954c28b418d4df3fc602ca0.