Revert ff245e1..5f55f31

This rolls back to commit ff245e11d9dfde0b419832eef7e058638de114d9.