Revert dbeea79..b606eb3

This rolls back to commit dbeea791ceb69f12aa5b37abfcc0a5b50d16c131.
Revert b606eb3..a428fb6

This rolls back to commit b606eb3a2ff2fc00b4df09eb1bc94721691dd626.