Revert 02865ba..fb0c682

This rolls back to commit 02865bae56690c95b0dcf285ebdd6b4701edabd1.