Revert 1ecf584..b6aeae4

This rolls back to commit 1ecf584de5d808446a756140335aa2d5fdec448d.