Revert b0b0a64..b1a3e52

This rolls back to commit b0b0a645e34c4c187c85700ca323147f267becf8.