Revert 387c955..8d74ccf

This rolls back to commit 387c9553f4bf3ea9e51be7de15ce744879236553.