Revert 144bf61..dd6677f

This rolls back to commit 144bf61236bbfb800aabc6fb3173624947824930.