Revert 4c40bd6..010d44c

This rolls back to commit 4c40bd60e0007da64cd5e694f1bef30e3525854b.