Revert ba302e4..4c60e16

This rolls back to commit ba302e499473d7ac10b64ab0339e5c6f06e1f4cf.