Revert 90466a3..4bc04d9

This rolls back to commit 90466a3671d72779be7b9fba3b331177669539c9.