Revert 2df1a30..3f84311

This rolls back to commit 2df1a3085c8d4cbf08f33aa2daf772e602d4fce3.