Revert c19ace5..be8d3b7

This rolls back to commit c19ace52efdb07c931403f325d5b10167669202f.