Revert 377fde5..663496e

This rolls back to commit 377fde5961a956de6c99dc79beded1657588ad25.