Revert 1768013..2a90023

This rolls back to commit 17680130d05a19092056d16eb688876948f5cebc.