Revert 4ccf973..7057617

This rolls back to commit 4ccf973f75480828159d5c28202d7a9b686495b4.