Revert c165ce0..562e920

This rolls back to commit c165ce0feb0b8f20677fd35bcdd92b55aacfeeb5.