Revert 8c8f632..dbde016

This rolls back to commit 8c8f63254b152a2c8d705dd4c7667d19bd8bb32a.