Revert 3366b72..f7de2d5

This rolls back to commit 3366b7240e463cbf66d026f26aa682eb6c18215f.