Revert aa1c060..bfb8af8

This rolls back to commit aa1c0602690a0b0925ab4a7e4881c5226ddc1d00.