Revert f6c4dc2..7c5d011

This rolls back to commit f6c4dc2aebe006905b77ebe459a8335ec7ce830a.