Revert 204d963..2dfabdd

This rolls back to commit 204d963f2aebbd63988fc9fb517f3ebad7a0cc08.