Revert bb13d46..9648c5d

This rolls back to commit bb13d46ee521b574629d7a14ab7276cf7a9e76a7.