Revert 49dfb6b..4714fe2

This rolls back to commit 49dfb6b222fd329e1576b9888fa7600eb7a819e4.