Revert "Bug"

This reverts commit c124eec0edbe72c2be17aaa3178d9cb5a3583fa9, reversing
changes made to 1959157524afe4b9ef603d31a50742bb0d4fae2e.