Revert af4027c..8560020

This rolls back to commit af4027c3dc16eb68bc0b1b75e9f94eb76cb6cd41.