Revert 0490b79..fd54751

This rolls back to commit 0490b795933cb60882b47db7d393f6d36503dac4.