Revert d6db544..7b54d4c

This rolls back to commit d6db5448fe914aec90f5cda55bafe3119c59e21e.