Revert 4b0e7bb..7863b5a

This rolls back to commit 4b0e7bb8594927380cae51d6b81da84783ea4f50.