Revert ba62f79..cbc1887

This rolls back to commit ba62f7919e0ba5e039a8a1697c5077cf8d110bb5.