Revert 76bc8f2..901c46c

This rolls back to commit 76bc8f2d8580375eea0ce882dc656f75fa39c502.