Revert 368ea87..d3b337f

This rolls back to commit 368ea875b3854dae9d00aee5a473c64d3b27c827.