Revert 25548c0..411aa4c

This rolls back to commit 25548c002124ad230ba3aa6ce1f3f219bfddeac2.