Revert 041db42..5500c28

This rolls back to commit 041db42dcbf0f2a6baaac5e02dd5b9e0224e7117.