Revert 4a31ada..80b278a

This rolls back to commit 4a31ada53e49540e898c749b3ebfcc08152a88e2.