Revert fc7bb8d..0f2e6ed

This rolls back to commit fc7bb8d564bf69ddeb4e276f72201f690d8063be.