Revert c5b1399..ef92778

This rolls back to commit c5b13990c530e0c4b6da04750e276faccb620b5d.