Revert 519feef..07036f4

This rolls back to commit 519feef6dec830017c748eedb97142783ad15d02.