Revert 3366b72..b673b83

This rolls back to commit 3366b7240e463cbf66d026f26aa682eb6c18215f.