Revert 6156062..f157e8f

This rolls back to commit 6156062fadeb1b3032b26e3bcc4ec05a60cbac13.