Revert 60e3df3..507f5a5

This rolls back to commit 60e3df38ea680a059feccbf5e1071ecfb86bd899.
Don't know what to do.