Revert c3893c9..a51503a

This rolls back to commit c3893c942d31bf7a33d7938ee7df868162810ff7.