Revert 42dcf59..936ca25

This rolls back to commit 42dcf5951e43bc0a74a05a6b21471857bcbac321.