Revert 24c764d..5c19a58

This rolls back to commit 24c764da776c8e4fc5052aaa939be2830bf38580.