Revert a7529b5..767af5e

This rolls back to commit a7529b5932add71a640379b757141ccbe81015f2.