Revert c4f9242..ab6b70e

This rolls back to commit c4f92420a5537bd5f6e07cb7fcad52da93d05460.