Revert 903bfba..fbfcc19

This rolls back to commit 903bfbab32efe9b1bf3a92c79bf0e773d1be60ab.