Revert 5e8ab27..d309b24

This rolls back to commit 5e8ab27304b5d9119709c8fbeea1f0397f12b161.