Revert 3c34f60..6206523

This rolls back to commit 3c34f600ec819f8fe03368011ea3efccb59cbed4.