Revert 7237723..8fb27fb

This rolls back to commit 723772336b7dfb6a2550e1e0be5f7aaf0b367972.