Revert dd0dff5..cf7348d

This rolls back to commit dd0dff568e01b78319111be162ef257750e7da61.