Revert 4d611b5..3ff23af

This rolls back to commit 4d611b5d56f9406c6123db3ab6f651d3cc0570ee.