Revert 15dbea9..92a7c7e

This rolls back to commit 15dbea992d7dc8521853583c571cbb07824b78da.