Revert 08fd039..2aae94e

This rolls back to commit 08fd0399518f3bbffd9cd3028e3a91fcf519cf03.