Revert 084be76..3851931

This rolls back to commit 084be7672558dc162a8476571b2c6f7bf920098c.