Revert 2f3cf7c..3894e0a

This rolls back to commit 2f3cf7cb83e95dfa2b7c7730dc13b13d637d3ac0.