Revert 6b080d7..99c760e

This rolls back to commit 6b080d722984cdd22bfc43e43ad1d559e49707bc.