Revert 8f83e04..bccec24

This rolls back to commit 8f83e04acddb1411f088ee659917d1010304a44f.