Revert ba1fcb8..dcbff5a

This rolls back to commit ba1fcb8416b39c9ab346abaf2864e59043cb4553.