Revert c937908..e8aa2db

This rolls back to commit c93790813afc2346dd2ee37c65705f845cddfec3.
Project